Remove wrong type from @param on ContentHandler::merge3
authorumherirrender <umherirrender_de.wp@web.de>
Thu, 14 Aug 2014 17:48:55 +0000 (19:48 +0200)
committerUmherirrender <umherirrender_de.wp@web.de>
Thu, 14 Aug 2014 19:39:01 +0000 (19:39 +0000)
commit921979b0bc14892de44aaa82c7e8bf7df918a59d
tree858cf92fb2538c2edd3957802f9a29f58e282754
parent6f458cfba3ad913df5f28ab5f4f41f5f38e9932b
Remove wrong type from @param on ContentHandler::merge3

When the method has a type hint of Content, there is no way to pass a
string, so remove that type from @param

Change-Id: Ifbf89d52cfa3ea8801c94f2d1b336e784133cce9
includes/content/ContentHandler.php
includes/content/TextContentHandler.php